1 files changed, 65 insertions, 39 deletions

diff --git a/src/yuzu/configuration/configure_input_per_game.cpp b/src/yuzu/configuration/configure_input_per_game.cpp
index 5773c268d..af5cee542 100644
--- a/src/yuzu/configuration/configure_input_per_game.cpp
+++ b/src/yuzu/configuration/configure_input_per_game.cpp
@@ -13,64 +13,90 @@ ConfigureInputPerGame::ConfigureInputPerGame(Core::System& system_, QWidget* par
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureInputPerGame>()),
       profiles(std::make_unique<InputProfiles>()), system{system_} {
     ui->setupUi(this);
-
-    Settings::values.players.SetGlobal(false);
-    const auto previous_profile = Settings::values.players.GetValue()[0].profile_name;
+    const std::array labels = {
+        ui->label_player_1, ui->label_player_2, ui->label_player_3, ui->label_player_4,
+        ui->label_player_5, ui->label_player_6, ui->label_player_7, ui->label_player_8,
+    };
+    profile_comboboxes = {
+        ui->profile_player_1, ui->profile_player_2, ui->profile_player_3, ui->profile_player_4,
+        ui->profile_player_5, ui->profile_player_6, ui->profile_player_7, ui->profile_player_8,
+    };
 
     const auto& profile_names = profiles->GetInputProfileNames();
+    const auto populate_profiles = [this, &profile_names](size_t player_index) {
+        const auto previous_profile =
+            Settings::values.players.GetValue()[player_index].profile_name;
 
-    ui->profile_player_1->addItem(QString::fromStdString("Use global configuration"));
-    for (size_t index = 0; index < profile_names.size(); ++index) {
-        const auto& profile_name = profile_names[index];
-        ui->profile_player_1->addItem(QString::fromStdString(profile_name));
-        if (profile_name == previous_profile) {
-            // offset by 1 since the first element is the global config
-            ui->profile_player_1->setCurrentIndex(static_cast<int>(index + 1));
+        auto* const player_combobox = profile_comboboxes[player_index];
+        player_combobox->addItem(tr("Use global input configuration"));
+        for (size_t index = 0; index < profile_names.size(); ++index) {
+            const auto& profile_name = profile_names[index];
+            player_combobox->addItem(QString::fromStdString(profile_name));
+            if (profile_name == previous_profile) {
+                // offset by 1 since the first element is the global config
+                player_combobox->setCurrentIndex(static_cast<int>(index + 1));
+            }
         }
+    };
+
+    for (size_t index = 0; index < profile_comboboxes.size(); ++index) {
+        labels[index]->setText(tr("Player %1 profile").arg(index + 1));
+        populate_profiles(index);
     }
+
     LoadConfiguration();
 }
 
 void ConfigureInputPerGame::ApplyConfiguration() {
     LoadConfiguration();
+    SaveConfiguration();
+}
 
+void ConfigureInputPerGame::LoadConfiguration() {
     auto& hid_core = system.HIDCore();
-    auto* emulated_controller = hid_core.GetEmulatedControllerByIndex(0);
+    const auto load_player_profile = [this, &hid_core](size_t player_index) {
+        Settings::values.players.SetGlobal(false);
+
+        auto* emulated_controller = hid_core.GetEmulatedControllerByIndex(player_index);
+        auto* const player_combobox = profile_comboboxes[player_index];
 
-    const auto selection_index = ui->profile_player_1->currentIndex();
-    if (selection_index == 0) {
-        Settings::values.players.SetGlobal(true);
+        const auto selection_index = player_combobox->currentIndex();
+        if (selection_index == 0) {
+            Settings::values.players.GetValue()[player_index].profile_name = "";
+            Settings::values.players.SetGlobal(true);
+            emulated_controller->ReloadFromSettings();
+            return;
+        }
+        const auto profile_name = player_combobox->itemText(selection_index).toStdString();
+        if (profile_name.empty()) {
+            return;
+        }
+        profiles->LoadProfile(profile_name, player_index);
+        Settings::values.players.GetValue()[player_index].profile_name = profile_name;
         emulated_controller->ReloadFromSettings();
-        return;
-    } else {
-        Settings::values.players.SetGlobal(false);
-    }
-    const QString profile_name = ui->profile_player_1->itemText(selection_index);
-    if (profile_name.isEmpty()) {
-        return;
+    };
+
+    for (size_t index = 0; index < profile_comboboxes.size(); ++index) {
+        load_player_profile(index);
     }
-    profiles->SaveProfile(Settings::values.players.GetValue()[0].profile_name, 0);
-    emulated_controller->ReloadFromSettings();
 }
 
-void ConfigureInputPerGame::LoadConfiguration() {
-    auto& hid_core = system.HIDCore();
-    auto* emulated_controller = hid_core.GetEmulatedControllerByIndex(0);
-
+void ConfigureInputPerGame::SaveConfiguration() {
     Settings::values.players.SetGlobal(false);
 
-    const auto selection_index = ui->profile_player_1->currentIndex();
-    if (selection_index == 0) {
-        Settings::values.players.GetValue()[0].profile_name = "";
-        Settings::values.players.SetGlobal(true);
+    auto& hid_core = system.HIDCore();
+    const auto save_player_profile = [this, &hid_core](size_t player_index) {
+        const auto selection_index = profile_comboboxes[player_index]->currentIndex();
+        if (selection_index == 0) {
+            return;
+        }
+        auto* emulated_controller = hid_core.GetEmulatedControllerByIndex(player_index);
+        profiles->SaveProfile(Settings::values.players.GetValue()[player_index].profile_name,
+                              player_index);
         emulated_controller->ReloadFromSettings();
-        return;
-    }
-    const QString profile_name = ui->profile_player_1->itemText(selection_index);
-    if (profile_name.isEmpty()) {
-        return;
+    };
+
+    for (size_t index = 0; index < profile_comboboxes.size(); ++index) {
+        save_player_profile(index);
     }
-    profiles->LoadProfile(profile_name.toStdString(), 0);
-    Settings::values.players.GetValue()[0].profile_name = profile_name.toStdString();
-    emulated_controller->ReloadFromSettings();
 }